<!DOCTYPE html>
<html>
<head>
    <meta charset="UTF-8">

    <link rel="apple-touch-icon" sizes="76x76" href="./assets/images/logo.png">
    <link rel="icon" type="image/png" href="./assets/images/c.png">

    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <title>一米</title>
    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no" name="viewport">
    <!-- Fonts and icons -->
    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" integrity="sha384-3AB7yXWz4OeoZcPbieVW64vVXEwADiYyAEhwilzWsLw+9FgqpyjjStpPnpBO8o8S" crossorigin="anonymous">    <!-- CSS Files -->
    <link href="./assets/vendor/now/css/bootstrap.min.css" rel="stylesheet"/>
    <link href="./assets/vendor/now/css/now-ui-kit.css?v=1.1.0" rel="stylesheet"/>
    <link rel="stylesheet" id="wp-syntax-css-css" href="./assets/styles/wp-mac-syntax.css" type="text/css" media="all">
    <link href="./assets/styles/style.css" rel="stylesheet">
    <!-- prism CSS Files -->
    <link href="./assets/vendor/prism/prism.css" rel="stylesheet">
</head>

<body class="wp-page sidebar-collapse">
<!-- Navbar -->
<nav class="navbar navbar-expand-lg bg-primary fixed-top navbar-transparent" color-on-scroll="200">
    <div class="container">
        <div class="dropdown button-dropdown menu-list">
            <a href="#" class="dropdown-toggle" id="navbarDropdown" data-toggle="dropdown">
                <span class="button-bar"></span>
                <span class="button-bar"></span>
                <span class="button-bar"></span>
            </a>
            <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
                <li class="cat-item"><a href="#">情感</a></li>
                <li class="cat-item"><a href="#">杂侃</a></li>
                <li class="cat-item"><a href="#">浅笑</a></li>
                <li class="cat-item"><a href="#">繁乱</a></li>
                <li class="cat-item current_cat"><a href="#">网络</a></li>
                <li class="cat-item"><a href="#">项目</a></li>
                <li class="dropdown-divider"></li>
                <li class="page_item"><a href="#">工具</a></li>
                <li class="page_item current_page_item"><a href="#">留言</a></li>
                <li class="page_item"><a href="#">链接</a></li>
            </ul>
        </div>
        <div class="navbar-translate">
            <a class="navbar-brand" href="./" rel="tooltip" title="" data-placement="bottom" data-original-title="一米"> 一米 </a>
            <button class="navbar-toggler navbar-toggler" type="button" data-toggle="collapse" data-target="#navigation" aria-controls="navigation-index" aria-expanded="false" aria-label="Toggle navigation">
                <span class="navbar-toggler-bar bar1"></span>
                <span class="navbar-toggler-bar bar2"></span>
                <span class="navbar-toggler-bar bar3"></span>
            </button>
        </div>
        <div class="collapse navbar-collapse justify-content-end" id="navigation" data-nav-image="./assets/images/blurred-image.jpg">
            <ul class="navbar-nav">
                <li class="nav-item">
                    <a class="nav-link" href="https://komplete.io/"><!-- 选中状态的 class btn btn-neutral-->
                        <i class="now-ui-icons gestures_tap-01"></i>
                        <p>Komplete</p>
                    </a>
                </li>
                <li class="nav-item">
                    <a class="nav-link" href="https://graceapi.com/" target="_blank">
                        <i class="now-ui-icons gestures_tap-01"></i>
                        <p>GraceApi</p>
                    </a>
                </li>
                <li class="nav-item">
                    <a class="nav-link" href="https://gitee.com/komplete/Candy" target="_blank">
                        <i class="fas fa-arrow-circle-down"></i>
                        <p>下载</p>
                    </a>
                </li>
                <li class="nav-item">
                    <a class="nav-link" rel="tooltip" title="Follow us on Twitter" data-placement="bottom" href="https://twitter.com/CreativeTim" target="_blank">
                        <i class="fab fa-twitter"></i>
                        <p class="d-lg-none d-xl-none">Twitter</p>
                    </a>
                </li>
                <li class="nav-item">
                    <a class="nav-link" rel="tooltip" title="Like us on Facebook" data-placement="bottom" href="https://www.facebook.com/CreativeTim" target="_blank">
                        <i class="fab fa-facebook-square"></i>
                        <p class="d-lg-none d-xl-none">Facebook</p>
                    </a>
                </li>
                <li class="nav-item">
                    <a class="nav-link" rel="tooltip" title="Follow us on Instagram" data-placement="bottom" href="https://www.instagram.com/CreativeTimOfficial" target="_blank">
                        <i class="fab fa-instagram"></i>
                        <p class="d-lg-none d-xl-none">Instagram</p>
                    </a>
                </li>
            </ul>
        </div>
    </div>
</nav>


<div class="wrapper index">
    <div class="page-header clear-filter" filter-color="orange">
        <div class="page-header-image" data-parallax="true" style="background-image: url('./assets/vendor/now/img/header.jpg');"></div>
        <div class="container">
            <div class="content-center brand">
                <!--<img class="n-logo" src="./assets/images/logo.png" alt="">-->
                <h1 class="h1-title"><a href="#" title="一米">一米</a></h1>
                <h3>永远有多远，或许只有一米的距离.</h3>
            </div>
            <!--<div class="arrow-down"><i class="now-ui-icons arrows-1_minimal-down"></i></div>-->
        </div>
    </div>
    <div class="main container">
        <div class="section section-basic">
            <article class="article" id="post-1929">
                <div class="header">
                    <h4><span><a href="./detail.html" title="如何将一套代码推送到多个版本库中" rel="bookmark">如何将一套代码推送到多个版本库中</a></span></h4>
                    <div class="meta text-muted">
                        <span><a title="2016/11/10 15:21:41" href="#">2016/11/10 15:21</a></span>
                        <span><a href="#">没有评论</a></span>
                        <span>371 次浏览</span>
                    </div>
                </div>
                <div class="body">
                    <p>需求是这样子的，就是想在家里弄个服务器，然后开发，将各种中间代码都推送到这个服务器上，当然了，肯定是使用版本管理中的 Git 嘛。但是当开发到一定程度的时候，也是需要将这个代码推送到公开的代码管理网站，例如 coding 或者 github。</p>
                    <p>那么怎么做呢？</p>
                    <p>本地的开发和版本管理就按照正常的 Git 的那一套走。<br>
                        然后想要推送到 Github 上的话，就按照下面的步骤来。<br>
                        1. 现在 Github 上新建一个 repository，然后获得一个可以推送的地址，例如 https://github.com/a/a.git;<br>
                        2. 然后将这个 git 地址添加到本地的 git 中。</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash"><code class=" language-bash"><span class="token function">git</span> remote add A https://github.com/a/a.git<span class="token punctuation">;</span> <span class="token comment"># A 是这个 remote 的名称</span><span aria-hidden="true" class="line-numbers-rows"><span></span></span></code></pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>然后使用</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash"><code class=" language-bash"><span class="token function">git</span> remote -v<span aria-hidden="true" class="line-numbers-rows"><span></span></span></code></pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>就可以查看本地的推送地址列表了。<br>
                        例如：</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash">
                                <code class=" language-bash">a   https://github.com/a/a.git <span class="token punctuation">(</span>fetch<span class="token punctuation">)</span>
a   https://github.com/a/a.git <span class="token punctuation">(</span>push<span class="token punctuation">)</span>
origin  https://git.net/b/b.git <span class="token punctuation">(</span>fetch<span class="token punctuation">)</span>
origin  https://git.net/b/b.git <span class="token punctuation">(</span>push<span class="token punctuation">)</span><span aria-hidden="true" class="line-numbers-rows"><span></span><span></span><span></span><span></span></span>
                                </code>
                            </pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>3. 然后就可以使用命令将这个代码推送到 GitHub 了。</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash"><code class=" language-bash"><span class="token function">git</span> push a master<span aria-hidden="true" class="line-numbers-rows"><span></span></span></code></pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>当然这个是完全一样的代码的情况下，<br>
                        如果还需要在两个不同环境有差异的话，那么最好新建一个分支。</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash"><code class=" language-bash"><span class="token function">git</span> checkout -b GitHubBranch<span aria-hidden="true" class="line-numbers-rows"><span></span></span></code></pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>然后在这个分支下面修改差异，这个时候就要将这个代码推送到 GitHub 的 GitHubBranch 分支了。</p>

                    <div class="wp_syntax wp_mac_syntax" style="position:relative;">
                        <div class="wp_mac_syntax_window_controls">
                            <svg xmlns="http://www.w3.org/2000/svg" width="54" height="14" viewBox="0 0 54 14">
                                <g fill="none" fill-rule="evenodd" transform="translate(1 1)">
                                    <circle cx="6" cy="6" r="6" fill="#FF5F56" stroke="#E0443E" stroke-width=".5"></circle>
                                    <circle cx="26" cy="6" r="6" fill="#FFBD2E" stroke="#DEA123" stroke-width=".5"></circle>
                                    <circle cx="46" cy="6" r="6" fill="#27C93F" stroke="#1AAB29" stroke-width=".5"></circle>
                                </g>
                            </svg>
                        </div>
                        <div class="code-toolbar">
                            <pre class="line-numbers language-bash"><code class=" language-bash"><span class="token function">git</span> push a GitHubBranch<span aria-hidden="true" class="line-numbers-rows"><span></span></span></code></pre>
                            <div class="toolbar">
                                <div class="toolbar-item"><a>Copy</a></div>
                            </div>
                        </div>
                    </div>

                    <p>然后再在 GitHub 合并 GitHub 上的 master 和 GitHubBranch 两个分支就可以了。<br>
                        这时候，GitHub 上面的 master 分支就可以是最新的代码了。<br>
                        当然了合并到哪个分支按照自己的需求来。</p>
                    <p>合并分支我用的是 pull request 合并的，（因为貌似我用了两个不同的账户？）。</p>
                    <p>完了。</p>
                    <p>主要是给自己记录用的，其实。</p>
                </div>
            </article>
            <article class="article" id="post-1923">
                <div class="header">
                    <h4><span><a href="./detail.html" title="面向梦想 踏实前行" rel="bookmark">面向梦想 踏实前行</a></span></h4>
                    <div class="meta text-muted">
                        <span><a title="2016/03/04 12:24:29" href="#">2016/03/04 12:24</a></span>
                        <span><a href="#">没有评论</a></span>
                        <span>919 次浏览</span>
                    </div>
                </div>
                <div class="body">
                    <p>尊敬的刘总，各位领导及各位同事：</p>
                    <p>　　大家好，很荣幸自己可以代表员工在华泰商学院的开学典礼上发言，感谢公司各位领导一直以来的关心及指导。</p>
                    <p>　　作为一名普通的物业管理员，与所有员工一样，正在亲历着公司因为互联网化所带来的全新变化，在这个变化中，我们不断的尝试、创新、形成属于我们华泰物业自己的文化，这是一次全新挑战，同时也是我们员工们一次难得的成长机会。</p>
                    <p>　　公司成立华泰商学院的目的，我觉得是想我们在公司转型成长的过程中能够跟的上脚步，让我们用知识来武装自己，用知识提升我们的能力，用能力更好的服务于业主。用更加专业化的服务来赢得业主的信任，从而获得业主对我们自身对华泰物业的认可。</p>
                    <p>　　在工作中我相信每个人都有自己所要实现的梦想和想要达到的目标，可是空谈梦想和目标只会让我们离它越来越远。</p>
                    <p>　　目标的实现需要公司领导的带领，但也需要我们自己的努力。设定目标，做好计划，主动思考，加强自身学习，不断尝试，坚持到底。公司为我们每一个人提供了同等的平台 ，商学院的成立正是我们起航的码头，在这个平台中，我们学习他人之长，补自己之短，我们可以把自己懂得会的拿出来分享与他人，在这个大家庭中一起进步，一起成长。</p>
                    <p>　　古人曾说，三日不读书，便觉语言无味，面目可憎，现在我们有了一个这样的学习平台，再不读书，不充实自己，面部的表情都可憎起来了，谈何对业主热情服务呢。</p>
                    <p>　　在公司大目标的前提下，建立自己所要实现的小目标，只有我们小目标的实现，最后才能完成公司大目标的实现。因此学习的过程，充实自己的过程虽是自己人生价值实现的过程，但也更是为公司成长和蜕变付出自己努力的过程。</p>
                    <p>　　最后预祝我们自己的商学院越办越好，也希望我们可以成长为比今天更好的自己。</p>
                    <p>　　谢谢大家。</p>
                </div>
            </article>
        </div>

        <!--<nav class="pagination clearfix" id="pagination">
            <div class="wp-pagenavi">
                <span>没有啦</span>
                <a href="#">旧的</a>
            </div>
        </nav>-->

        <nav class="pagination clearfix" id="pagination">
            <div class="wp-pagenavi">
                <span class="pages">40/1</span>
                <span class="current">1</span>
                <a class="page larger" href="#">2</a>
                <a class="page larger" href="#">3</a>
                <a class="page larger" href="#">4</a>
                <span class="extend">...</span>
                <a class="larger page" href="#">10</a>
                <a class="larger page" href="#">20</a>
                <span class="extend">...</span>
                <a class="nextpostslink" rel="next" href="#">»</a>
                <a class="last" href="#">最后 »</a>
            </div>
        </nav>


    </div>
</div>



<div class="wrapper">
    <!--  End Modal -->
    <footer class="footer" data-background-color="black">
        <div class="container">
            <nav>
                <ul>
                    <li>
                        <a href="https://www.creative-tim.com">Creative Tim</a>
                    </li>
                    <li>
                        <a href="http://presentation.creative-tim.com">About Us</a>
                    </li>
                    <li>
                        <a href="http://blog.creative-tim.com">Blog</a>
                    </li>
                    <li>
                        <a href="https://github.com/creativetimofficial/now-ui-kit/blob/master/LICENSE.md">MIT License</a>
                    </li>
                </ul>
            </nav>
            <div class="copyright">
                © <a title="一米" href="#">一米</a> 非常感谢<a title="自豪的采用 WordPress" href="http://demos.creative-tim.com/now-ui-kit/index.html" target="_blank"> Now UI Kit</a>
            </div>
        </div>
    </footer>
</div>

<!--   Core JS Files   -->
<script src="./assets/vendor/now/js/core/jquery.3.2.1.min.js" type="text/javascript"></script>
<script src="./assets/vendor/now/js/core/popper.min.js" type="text/javascript"></script>
<script src="./assets/vendor/now/js/core/bootstrap.min.js" type="text/javascript"></script>
<!--  Plugin for Switches, full documentation here: http://www.jque.re/plugins/version3/bootstrap.switch/ -->
<script src="./assets/vendor/now/js/plugins/bootstrap-switch.js"></script>
<!--  Plugin for the Sliders, full documentation here: http://refreshless.com/nouislider/ -->
<script src="./assets/vendor/now/js/plugins/nouislider.min.js" type="text/javascript"></script>
<!--  Plugin for the DatePicker, full documentation here: https://github.com/uxsolutions/bootstrap-datepicker -->
<script src="./assets/vendor/now/js/plugins/bootstrap-datepicker.js" type="text/javascript"></script>
<!-- Control Center for Now Ui Kit: parallax effects, scripts for the example pages etc -->
<script src="./assets/vendor/now/js/now-ui-kit.js" type="text/javascript"></script>
<script src="./assets/scripts/clipboard.min.js"></script>


<script src="./assets/scripts/prism.js"></script>


<script src="./assets/scripts/common.js" type="text/javascript"></script>
<script type="text/javascript" src="./assets/scripts/comments.js"></script>


</body>
</html>